Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 04:33:26 +0000 (20:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 04:33:26 +0000 (20:33 -0800)
commit8e97e47f53dbdcf700b8467e04d42f087b90d5ce
tree176002e39b1fa70ddb86bee2368c7f396398aa17
parenta38eb754e5d88aa2a2bdc12488af680aec69cad8
parent1c1ecf9f3125cdd135108a87116076dfa2f08424
Merge from trunk.